Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev