* changes:
  Ignore DHCP discover and request w/ invalid giaddr
  Send ciaddr in DHCP server ACK if set by client

* changes:
  Don't apply filter in readback, when there is no scaling
  Set AppStandbyController charging state on init
  Fix TextureView.getBitmap with scale layer transform

- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
Merged-In: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
(cherry picked from commit ea8970cd)

The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS）
2.flag clir on and flag cw on ,do CW on/off,and CW function work.（PASS）
3.flag clir off and flag cw on ,no CLIR in additional settings page（PASS）
4.flag clir off and flag cw on ,do CW on/off,and CW function work.（PASS）
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.（PASS）
6.flag clir on and flag cw off ,no CW in additional settings page（PASS）
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings（PASS）
8.flag cf off,no cf in call settings page (PASS)
Merged-In: I7f11346be248bd325f14d7039f5a5d5b2f45617a
Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71

It's not used, and there is no reason to keep it now that P has been
pushed to AOSP.

Test: N/A
Change-Id: Ib025116032bdb215dba5b51de4c7ea8ad7dd10d5
Merged-In: I51bf94b736cae57780708a70947511c409a2dfb6

ServiceState.copyFrom would throw NPE if s.mCellBandwidths is null.
To fix, if s.mCellBandwidths is null, init mCellBandwidths to be null.

Test: Build pass;
Test: atest FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 112714563

This matches previous behavior, and there could be situations where
another server on the network would be configured to reply to such
requests, so not replying is better than sending NAKs as done now.

Also refactoring requests in DhcpLeaseRepositoryTest and replacing some
INETADDR_UNSPEC usages for giaddr with INET4_ANY (giaddr is a BOOTP
field and can't be unspecified, only empty).

Test: Following DhcpServerTest.py regression tests pass:
      test_request_selecting_giaddr_outside_subnet
      test_discover_requestaddress_giaddr_outside_subnet
      test_discover_knownaddress_giaddr_outside_subnet
      test_discover_giaddr_outside_subnet
      Also: atest FrameworksNetTests passes
Change-Id: I4decffccfc64d5e0e29c9ce1cf1446644fcf8190

Test: makeg doc-comment-check-docs
Bug: 112440728
Change-Id: I0c953ce2112e30534847fafc8ab9d286e82a102f

Bug: 112867975
Test: make docs
Change-Id: I281d30f874136c77ad1d0e66747694bb1b79e67c

This patch changes tunnel mode security policies to use the actual
tunnel's local and remote addresses to select the SA.
This prevents the kernel from calling xfrm_get_saddr(), which does a
route lookup, potentially resolving an incorrect saddr.

Bug: 79384676
Test: CTS, IpSecService* tests passing
Change-Id: I8223225e2363a79591a0bb0040aa8619cf84c184

Generating hidden API lists has grown in complexity and the original
Makefile rule has become a bottleneck for build times. Rewrite the
logic in Python.

Bug: 113278235
Bug: 73736106
Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py
Change-Id: I63f03133d70260d06c55f482b844a4980dc6f734

ActivityManagerService decides on the non-SDK API enforcement policy
of every newly spawned process. System apps can be exempted by adding
their package name to a config XML file, tests can pass a flag to
'am instrument'. This patch adds a new @hide attribute on the <application>
manifest tag, "android:usesNonSdkApi", which can be used by both
system apps and tests, and is automatically set by the build system.

The use of the attribute remains guarded as follows:
- if invoked via 'am instrument', must hold shell user permission,
- if app launched, must be a system app or an updated system app.
The attribute is ignored in all other cases.

Bug: 113315999
Test: N/A
Merged-In: I2f6cb56f63fa2c5dd6c7c25fcefe8205da1ec96a
Change-Id: I2f6cb56f63fa2c5dd6c7c25fcefe8205da1ec96a
(cherry picked from commit 787b6f22)

For all remaining unannotated code.

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I32861fa341a08f11a9c50c07a1ef7404dadf6bb6
Merged-In: I67c8b71ea535ebffb10bf577948bd4ccb8ca069d

* changes:
  Fix DHCP options sent by DHCP server
  Fix BOOTP fields for server-generated DHCP packets

RFC2131#4.3.1 specifies that ciaddr should be set to the "'ciaddr' from
DHCPREQUEST or 0". Previous behavior sets ciaddr if provided by the
client in DHCPREQUEST, so keeping this behavior.

Bug: b/109584964
Test: DhcpServerTest.py debian/macos/win10 renewing test pass
Change-Id: I283e88b1f66f39d24589c5af4518cf9a2e77b95d

 - Do not use Inet4Address#toString(), but Inet4Address#getHostAddress()
 - Dump enableLegacyDhcpServer in TetheringConfiguration

Bug: b/109584964
Test: manual: flashed, observed logs
Change-Id: I1f4d008b8bb1818e05a68ac0b5da4ce856cc1588

This reverts commit 3284e350.

Reason for revert: breaks most branches

Bug: 112867975
Change-Id: Icb27e193529f523f4cf07ef55e19625c402a2d3b

Add Android metered option, rebinding time option (T2), and match
current order of options.  Current DHCP server uses subnet_mask,
broadcast_address, router, name_server in this order.

Test: DhcpServerTest.py:test_discover_paramrequestlist passes
      atest FrameworksNetTests passes

Bug: b/109584964
Change-Id: I58f904d5fac306f704c16234fd69c2440fe0803d

Set siaddr to the server address instead of zero in DHCPOFFER
Set siaddr to zero instead of the server address in DHCPNAK
Set giaddr to the relay address instead of the server address in
DHCPNAK
Set giaddr to the relay address instead of zero on DHCPACK and
DHCPOFFER
Set server identifier option in DHCPNAK

Current code is not compliant with RFC2131 and does not match dnsmasq
behavior. It was not an issue until now since the packets were only used
by the DHCP client, which does not send DHCPOFFER or DHCPNAK.

Bug: b/109584964
Test: following DhcpServerTest.py regression tests pass:
      test_discover_bootpfields
      test_request_selecting_inuse
      test_request_rebinding_relayed
      test_discover_relayed_broadcastbit
      test_request_rebinding_wrongaddr_relayed
      Also: atest FrameworksNetTests

Change-Id: Ie0bf780498e38945444bff66ca499cff5983a97f