base

am cff23c2f: Merge commit \'d1808401\' into manualmerge

* commit 'cff23c2f96f7dce80e3df0a103d8d515f394d634': (47 commits)
  Clarifying which receiver method to call.
  SystemUI strings: prospective VPN strings for apps
  Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
  Import translations. DO NOT MERGE
  Add a libbase static depedency for aapt2.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Expand the notification panel by Meta-N.
  DO NOT MERGE - Make sure to return network type after conversion
  DO NOT MERGE - Radio Access Family related fixes
  DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
  Fix incorrect getType signature/implementation in doc.
  Add plumbing for merge failures and renable button. (3/4)
  Changed logging tag.
  Fix the javadoc for requestBandwidthUpdate(...)
  Add accessibility actions for scrolling in different directions
  Fixing issue where conference calls enable speaker phone.
  Use a separate intent action for subscription phone state changes.
  Import translations. DO NOT MERGE
  ...