am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev

* commit '72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
  Respect custom view drawing order when dispatching hover events.
am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev

* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.
am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev

* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.
am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev

* commit '1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
  always trigger a re-draw when updating the transparent region hint
am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev

* commit '629b1c4f2042ef0f1da4fe543cca34deedd3ba5d':
  Make --non-constant-id generates non final IDs for styleable.
am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev

* commit '80fccb4dda9b2c46955e05b8be9e6071e0cc347b':
  There should be a mandatory coder's license. Bug #8586560
am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev

* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
  Add a little more resource load tracing.
am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable."

* commit 'a068eeddc9d47af1a12afbe6efe7d00e8e903b9f':
  Revert "Make --non-constant-id generates non final IDs for styleable."
am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev

* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
  Introducing manifest flag requiredAccountType
am e1375908: Rename isUserLimited to isLinkedUser

* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
  Rename isUserLimited to isLinkedUser
am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev

* commit '330a9fe323cfb2f492665b73822f056c2c6689c2':
  Unhide new RS APIs.
KeyEvent: update comment

Change-Id: I1ea491e7e23670bf0ea83392710010b557803178
am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev

* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev

* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev

* commit '7e157f321c690e41f0f18a556f989fd20709469f':
  Deprectate WebViewDatabase password methods.
am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev

* commit '74e56f19299cd04e2e6c6a9a19af260551750d6a':
  Public APIs for media position in RemoteControlClient
Check outInfo is not null

Only call keystore if outInfo is not null

(cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c)

Bug: 8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
Merge "Check outInfo is not null"
Reconcile with jb-mr2-release - do not merge

Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
Remove keystore entries when app data cleared

When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

(cherry picked from commit 6fd1c85d7f909580582e5ebc357564331ecef283)

Bug: 8566369
Change-Id: Id4df5e50661b676b8f6507b915764400982c01a0